Improved layout (more compact)