Simplify GUI code - step 1