Fixing a bug with menu

Adding some conditions for margin to container block.
Update a condition for show menu