Tidy up, improve styles
Added settings to repository