#209 Some more styles changes