latest updates with some UI Improvments