Improved layout a bit