Fixed some buttons, added saving on search