Bootstrap: more styles, fix renamig