Separate layouts and fix problem with menu query