Improved layout and standardized validation