Bug fix
Visual enhancements