Fixed layout and formatting issues