Magic menu line added, some fixes
Magic menu line added, some fixes