Moved things around for ui