Edited Hubs, added Hubs, changed controlls