Some rather obvious GUI optimizations