Several visual fixes