final big fixes and added menu bar