Fixed UI issues with dialog