Fixes of appearance and style