big changes, mainly to use bootstrap (annoying though it is)