rework some views