Correct all design (issue : view files were like mixed)