Repair design
Fix some views