UI changes, more data added