Fix default layout to contain the correct panels
Add layout menu