switch to generic views fix urls and views