UX and UI Improvements

by rajesh