Add simple form and clean up basic design