moving around stuff, adding makefile
adding null check for toolbars