Added templates and menu styling
Resolved conflict