Better views for both admin and front-end