Major gui changes
Made it work better