Reorganizing a lot of the styles and layouts.
Fixed some layout bugs.