fixed some routing and base url