changes to save method, some styling