Fix more layout divs and ids

Fix more layout divs and ids