update bootstrap version
fix layout and remove the duplicate bootstrap include