UI fixes and random crash resolved.