Small refractoring of core and layout
Merge remote-tracking branch 'origin/youssefbranch' into youssefbranch
Merge pull request #162 from se1-1314/youssefbranch

Youssefbranch