FIX: Incorrect comment markup
UI improvement