layout and styling improvements