Improvments. Migrate to bootstrap 3.1