adding bootstrap and some changes