Improved layout a little