Fixed some url stuff and views stuff