Moved a few things I think looks nicer now haha