Fix UI bugs in Master brand. Some Random crash on NPE, will investigate later