Added navigation
FIxed home template and room creation
Merged templates