rework views a bit