Fixing Navigation layout