Cleaned up urls and views