Tests and Refactoring

Also less blinky/shifty views when adding/saving