Refactored GUI DSL