After tweaking the UI from my end