#27 Fix some styles -SF