Layout and styling improvements