Added Save-Button and some Conditions