merged several ui changes

you'll still need to look into index.jade.. and see if it loads up properly