Fixed #40 and a few CSS stuff