s4 more cleanup on GUI