fixing drawing table issues, tidying up GUI