Add layout for DRYness
Remove unused routes