Finished the first wave of GUI redesign