fixes for layout, and grunt cleanup