Some minor code tweaks + added bootstrap demo