Bugs fixed, but I broke CSS. Need Jane to fix.