Updated Layout to include tabs and removed unused templates