UI changes

Author: Maulik Patel