Simplify layout and formatting