bootstrap 3 upgrages and code cleaning