diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 24698fc0..8ad48429 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/EDIT.S.CTRL.txt b/BIN/EDIT.S.CTRL.txt
index da07410b..6f97c88b 100644
--- a/BIN/EDIT.S.CTRL.txt
+++ b/BIN/EDIT.S.CTRL.txt
@@ -436,7 +436,7 @@ Ctrl.Q			lda #$FF
 				rts
 *--------------------------------------
 Ctrl.S			>LDYA L.DLG.SAVE
-				jsr SCRN.DLGShow
+				jsr DLG.Open
 				clc
 				rts
 
diff --git a/BIN/EDIT.S.SCRN.txt b/BIN/EDIT.S.SCRN.txt
index 833ee788..e271b1f4 100644
--- a/BIN/EDIT.S.SCRN.txt
+++ b/BIN/EDIT.S.SCRN.txt
@@ -534,10 +534,14 @@ SCRN.scrollDn	>PUSHBI 0
 
 .9				rts
 *--------------------------------------
-SCRN.DLGShow	>STYA ZPPTR1
+DLG.Open		>STYA ZPPTR1
 				jsr DLG.GetOrigin
+				stx TmpIndex
+				sty TmpIndex+1
+				
 				stx TmpLen
 				sty TmpLen+1
+				
 				jsr SCRN.GotoXY
 				bcs .9
 				
@@ -591,12 +595,96 @@ SCRN.DLGShow	>STYA ZPPTR1
 				jsr DLG.InvBar
 				bcs .9
 				
-				ldx #10
-				ldy #10
-				jsr SCRN.GotoXY
+				ldy #6
+				sty TmpByte
 				
+.5				lda (ZPPTR1),y
+				beq .8
+				
+				tax
+
+				>LDYA.G LineBufBase
+				>STYA LineBufPtr
+
+				jsr .6
+				bcs .9
+
+				ldy TmpByte
+				iny
+				bra .5
+
+.6				jmp (J.DLG.DrawCtrls-2,x)
+				
+.8				clc				
 .9				rts				
 *--------------------------------------
+DLG.DrawCtrls.L	jsr DLG.DrawCtrls.GotoXY
+				bcs .9
+				
+				ldy TmpByte
+				lda (ZPPTR1),y
+				tay
+				
+.1				lda (ZPPTR1),y
+				beq .8
+				
+				jsr SCRN.ToLineBuf
+				iny
+				bra .1
+				
+.8				jmp SCRN.LineBufOut
+.9				rts
+
+DLG.DrawCtrls.TB
+				jsr DLG.DrawCtrls.GotoXY
+				bcs .9
+				
+				ldy TmpByte
+				iny
+				iny
+				iny
+				lda (ZPPTR1),y
+				sty TmpByte
+				
+			>DEBUG
+				tay
+				lda (pData),y
+
+				>SYSCALL getmemptr
+				>STYA TmpLen
+	
+				ldy #0
+				
+.1				lda (TmpLen),y
+				beq .8
+
+				jsr SCRN.ToLineBuf
+				iny
+				bra .1
+				
+.8				jmp SCRN.LineBufOut
+.9				rts
+*--------------------------------------
+DLG.DrawCtrls.GotoXY
+				ldy TmpByte
+				
+				iny
+				lda (ZPPTR1),y
+				clc
+				adc TmpIndex
+				
+				tax
+				
+				iny
+				lda (ZPPTR1),y
+				clc
+				adc TmpIndex+1
+				
+				iny
+				sty TmpByte
+				tay
+				jmp SCRN.GotoXY
+*--------------------------------------			
 DLG.GetOrigin	lda (ZPPTR1)			X
 				bne .1
 				
@@ -648,31 +736,22 @@ SCRN.LineBufInitInv
 DLG.InvBar		phy
 				jsr SCRN.LineBufInitInv
 				
-				ply
-				phy
-				lda (ZPPTR1),y
-				tay
-				lda (ZPPTR1),y
-				tax
-				
-.1				iny
-				lda	(ZPPTR1),y
-				jsr SCRN.ToLineBuf
-				dex
-				bne .1
-				
 				ldy #2					W
 				lda (ZPPTR1),y
+				tax
+
 				ply
-				pha
 				lda (ZPPTR1),y
 				tay
-				pla
-				sec
-				sbc (ZPPTR1),y
-				tax
 				
-				lda #C.SPACE
+.1				lda (ZPPTR1),y
+				beq .11
+				jsr SCRN.ToLineBuf
+				dex
+				iny
+				bra .1
+				
+.11				lda #C.SPACE
 				
 .2				jsr SCRN.ToLineBuf
 				dex
diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt
index 23959687..b62f1423 100644
--- a/BIN/EDIT.S.txt
+++ b/BIN/EDIT.S.txt
@@ -132,7 +132,9 @@ J.CTRL			.DA Ctrl.Invalid
 				.DA Ctrl.Invalid
 				.DA Ctrl.Invalid
 				.DA Ctrl.Invalid
-L.DLG.SAVE		.DA DLG.SAVE	
+L.DLG.SAVE		.DA DLG.SAVE
+J.DLG.DrawCtrls	.DA DLG.DrawCtrls.L
+				.DA DLG.DrawCtrls.TB
 				.DA 0
 *--------------------------------------
 CS.INIT			clc
@@ -423,16 +425,31 @@ DLG.SAVE		.DA #0					X
 				.DA #8					H
 				.DA #DLG.SAVE.T-DLG.SAVE	Title
 				.DA #DLG.SAVE.S-DLG.SAVE	Status
-				.DA #1,#4,#3				LABEL,x,y
-				>PSTR "Filename :"
-				.DA #2,#4,#4,#64,#hFileName		TEXTBOX,x,y,MAXCHAR,hMem
-				.DA #1,#4,#6					LABEL,x,y
-				>PSTR "Filetype :"
-				.DA #3
-				.DA L.MSG.FILETYPES
+
+				.DA #2,#3,#2				LABEL,x,y
+				.DA #DLG.SAVE.L.FN-DLG.SAVE
+
+				.DA #4,#3,#3,#1,#64,#hFileName	TEXTBOX,x,y,ID,MAXCHAR,hMem
+
+				.DA #2,#3,#4				LABEL,x,y
+				.DA #DLG.SAVE.L.FT-DLG.SAVE
+				
 				.DA #0
-DLG.SAVE.T		>PSTR "Save As..."		Title
-DLG.SAVE.S		>PSTR "CR:Save, Ctrl-T:Change Type, Ctrl-C:Cancel"
+				
+				.DA #6,#3,#5,#2			OPTIONLIST,x,y,ID
+				.DA #3
+				.DA #DLG.SAVE.OL.CR
+				.DA #DLG.SAVE.OL.LF
+				.DA #DLG.SAVE.OL.ASM
+
+				.DA #0
+DLG.SAVE.T		.AZ "Save As..."		Title
+DLG.SAVE.L.FN	.AZ "Filename :"
+DLG.SAVE.L.FT	.AZ "Filetype :"
+DLG.SAVE.OL.CR	.AZ "TXT/CR"
+DLG.SAVE.OL.LF	.AZ "TXT/CRLF"
+DLG.SAVE.OL.ASM	.AZ "S-C/ASM"
+DLG.SAVE.S		.AZ "CR:Save, Ctrl-T:Change Type, Ctrl-C:Cancel"
 *--------------------------------------
 				.DUMMY
 				.OR 0