major design improvements with some js