Fixing  UI designer issues