add bootstrap, cleanup, adjusted test for django