finished fixing bootstrap 3 compatibility