Major GUI overhaul