Modify to work with latest bootstrap, improve layout styles.