Font tweak
Merge remote-tracking branch 'origin/master'

Merging UI and angular

Updating ui with angular