Modified views and layout to dry up code.