Add simple form and fix bug so it works