A few design changes + js fixes