Preliminary cleaning of layout and index views. Adds helper views.