Restructure views

Heavy styling. Resolved merge conflict.