Updated with bootstrap 3