some fixes, first attempt to add icons to gui