Cache fixes. Hey, what did you expect?
Small layout fix
Remove a solved question from cache
Merge remote-tracking branch 'upstream/master'