Removing haml
Fixing javascript bug and preliminary form