fixed localization freeze and improved bootstrap markup