Added simple form and some front-end changes