Refactoring - GUI