More layout and styles cleanup.