Fixed URL-structure, added optimizing