Separeted some routes, small style changes