Frickled a lot of stuff to change the layout