added administration menu
Optimized views (better reuse)