Improve layout with bootstrap/css/sass and refactor