work on styling and bootstrap
fixed merge conflicts