various fixes across ui