Optimized GUI, small fixes