#46 Smaller visual fixes