Fix validation
Fix saving I just broke by fixing validation... tidy up export
More UI tweaks