GUI refactoring. All except edit supplier