Replace modified bootstrap with original bootstrap

Attempt to move modifications to main.css instead of bootstrap.css
Adjust margins in stylesheet.css instead

instead of in bootstrap.css
Fix navbar-btn