put views in id'd sections

Change-Id: I745b02f7d473fcbfae0f993ac865984111bfe296