#4: Add notification area
#5: Add Logout link/button
Merge remote-tracking branch 'origin/master'