Small improvements made to master view UI.
Merge remote-tracking branch 'origin/master' into connect-to-backend