Added check on save and removed top Save and Close buttons