#1231. #1229, and some css tweaking.
Signed-off-by:KProvance <kevin.provance@gmail.com>