Rearranged homescreen

#615 #616

Also fixed a problem with PUTs in controllers