Minor UI tweaks, re-ordering data saves to persistent store now