Improved layout & design