Added several options and adding page for entities