adding the last UI changes and comments