Added menuless layout
Merging branches