refactored servlet and view mappings