Fixed layout
Cleaned up
Bunch of junk!