Added bootsrap, and some layout changes