merge in jacob's changes and also remove inline styling from html among other general cleanup