WL-114 UI improvements as per Griff suggestions.

@griffresch @chrisndodge kindly review it and let me know if any further UI touchup is required ? 

Thanks.