UI fixes across templates