Minor rendering enhancement + cleanup + comments
Validating nick field closes option window