Updated views and added status bars
Merge remote-tracking branch 'origin/master'
Updated views and added status bars