cleaned up some stuff
Merge branch 'modals-and-screens'