Cleaned up urls, made view functions all action words