Did some touching up and redid main screen
Merge branch 'touchup1'