Added icon for tabs and tidied up interface, removed legacy file