Continued Edits of EditScreen

Primarily visual edits here