Simplify GUI code - step 2