Add some CSS, fix some logic