visual enhancements and bug fixes