Move layout file to proper location, add validations, and stuff