cleans up navigations, adds save buttons