Add entry table
Merge remote-tracking branch 'origin/admin' into admin-entry
Remove include header from entry view