Code refactor; metisMenu fix