Commit
Observers and tool bar sorted out.