Improve formatting and layout