Move some styles into css, update js todo