Issue #185 - Making things beautiful