First set of changes for prototype ui.