Bug fix to work with themes that don't support bootstrap
More bug fixes, and php notices removed.