Added save_and_restore_groups, the same one for layout borders was removed
Changes in opt handling
groups save and restore