lots of tinkering/testing, minor cosmetic adjustments, refactor css