Move main ui over to font-awesome
Info sidebar tweaks
Check for null when undoing history actions
Add declarative menu structure
Merge remote-tracking branch 'upstream/master' into delay-test