Improved visual layout