Started adapting to bootstrap 3