POC 3rd April - minor UI changes