Fix multiblock issue
Remove basic components items
Revert previous commit, whoops.
Fix main menu appearing after closed in rare cases.
Merge branch 'master' into 2.0