added download and print icons
cleaned up some code