Minor layout and styling changes