route and image fixes