Visual improments, mainly on #22