Improved layout a little more