Continuation of GUI revamp