Jbau save button

@sefk  relatively big package due to the refactoring and bugfixes