remove duplicate resources
decorate  theses
cleanup
fix index view