layout + js fixes