store combos in an entity object;
added tabs to sidebar;