added flag to enable toolbar, cam still doesn't scale to bottom
merge fix