Reorganizing and fixing styles/layouts.