new changes including bootstrap and etc