#60 Visual fixes