clean up main view html
Merge branch 'jay-new' into mimi to get updates.
Merge branch 'jay-new' into mimi
refactor all html and css
add screen shots of older version of app
Fix conflicts in merging with mimi branch.