Optimized code and further modularized views and templates