Navigation icons added. + code reformatting
Merge branch '12_List_navigation_icons'