modified styling and routes logic flow
commented out invalid tests
fixed merge conflicts
Merge branch 'CSS_Skeleton'

fixed merge conflicts