Refactored entry views