Simplify GUI code - step 3