Added bootstrap
Added more super-basic formatting
Merge branch 'frontend'