Added app form and revised mockups based on this