Improved general layout.