Feature/omar/refactor into view