Improved layout a lot...