Revise urls and content serving implementation