added bootstrap along with quite a bit of changes