Improve layout + validation