Improved layout a little bit