ui bootstrap integrated and minor changes