Deepak | #724 | Changed UI according to feedback on the story