Layout tweaks, simplified some CSS and HTML
Themeing some bootstrap 3 elements