Added icons for buttons., added borders visible for parent sections,
removed combo.