Clean up layout and text spacing