Changed some comments and UI display