Merge lookandfeel
Closes #616

Also adds better Mac delete keyboard shortcut support
Add viewport update calls to improve redrawing