dashboard layout, revise main.css to leverage bootstrap
fix merge conflict