Fix #440 plus some css tweak.