Work on gui overhaul