responsive styling half done
merge conflict