A little styling and a bug fix #172