rebase on bootstrap, start adding content