Small fixes of style and visual