Save function added and styling is more protected'