Updates UI
Merge branch 'StyleUpdate' into dev