Restyling everything
Cleaned up and merging from Kalei