COB
Merge branch 'development' into ui
Added styling