Layout and styling improvements to match design mock