Added more sections and icons