Many small styling changes. Fixed #170