refactored routing
merged and refactored zombie views