Added visuals and moved a couple things around