Added some comments. Minor UI improvements