Final template updates
Final admin updates
Improve admin panel experience