Add bootstrap and changed some layouts