adjusted views and urls