Updated deafult layout
Merged changes