Clean up, fix and update

Clean up the code, forms displaying fix, gutter change, bootstrap
update.