Sales Pro GUI refactoring