more layout and styling changes