frontend stuff
fixed merge conflict with col-md-12 versus col-md-4/col-md-8