Rebase on pull
UI changes for ST2