Improvements, added text and icon label support