UI, CSS, editScreen

Updates to UI, css styles and edit screen