added tooltips for technology icons and tidied up some of the buttons
end of the hackthon
fixing merge conflicts