Finished a few ayouts and changed some routes