Used bootstrap to add minimal style
fixed merge conflicts