some UI changes
some overhual for UI