changed GUI, FIX UGLY CODE