reworking some views