refactored/reorganized views and urls