Several small updates and fix for toolbar inclusion