Bootstrap material design (fix merge conflict)