Updated Routes based on suggestion and ammended main layout