Refactored entities
Added editable pages into administration