Fixed FA and Bootstrap Issues