Updated master version so it works with current topMenu version, fixed many things