rework views, add containers