some more layout changes and main ids