Final commit before testing
Added save, plus lots of visual adjustments