Visually improved the settings page
Added a logout button and made some minor css changes
Fixed dashboard.hbs merge