UI changes + staging for user comments