Improved base layout