updated layouts
Merge branch 'shammaalhetmi-master'
with shamma's conflicts fixed