--- a/code_part1/OSTC_code_asm_part1/menu_logbook.asm	Wed May 22 14:46:00 2013 +0200
+++ b/code_part1/OSTC_code_asm_part1/menu_logbook.asm	Thu May 23 10:59:34 2013 +0200
@@ -59,9 +59,9 @@
 
 
 menu_logbook1a:
-	WIN_INVERT	.1
+    call	DISP_divemask_color
 	DISPLAYTEXT	.12							;" Wait.."
-	WIN_INVERT	.0
+    call	DISP_standard_color
 	call 		I2CReset					; Reset I2C Bus
 	call		get_free_EEPROM_location	; search from "here" backwards through the external memory
 
@@ -82,9 +82,9 @@
 ; recopy data to search from here
 
 menu_logbook1b:
-	WIN_INVERT	.1
+    call	DISP_divemask_color
 	DISPLAYTEXT	.12						;" Wait.."
-	WIN_INVERT	.0
+    call	DISP_standard_color
 
     ;---- fast loop: check every other byte ----------------------------------
 menu_logbook2:
@@ -200,11 +200,10 @@
 	btfss		logbook_page_not_empty		; Was there one dive at all?
 	bra			menu_logbook				; Yes, so reload the first page
 
-	call		DISP_topline_box			; Draw box
-	WIN_INVERT	.1	
+	call	DISP_topline_box_clear	; Clears Bar at the top
+    call	DISP_divemask_color
 	DISPLAYTEXT	.26							; "Logbook"
-	WIN_INVERT	.0
-	
+    call    DISP_standard_color
 	DISPLAYTEXT .11							; Displays "Exit" in the last row on the current page
 
 	call		menu_pre_loop_common		; Clear some menu flags, timeout and switches
@@ -1372,10 +1371,10 @@
 
 	btfsc		logbook_header_drawn		; "Logbook already displayed?
 	bra			display_listdive1a
-	call		DISP_topline_box			; Draw box
-	WIN_INVERT	.1
+	call        DISP_topline_box_clear      ; Clears Bar at the top
+    call        DISP_divemask_color
 	DISPLAYTEXT	.26							; "Logbook"
-	WIN_INVERT	.0
+    call        DISP_standard_color
 	bsf			logbook_header_drawn
 	
 display_listdive1a: