Improved layout slightly