UI changes done for now