More layout and styling work.