fixed icons and added subheadings