Some bootstrap improvements + fix lang switcher