progress on ui move