Questions page styles

hey guess what @meghowie, no merge conflicts!

how did you try to merge in master? `git pull origin master` into your branch is the most fail-safe way.