Custom bootstrap them change, minor changes