Improved menu, moved iTunes to its own object