Bug fixes and addition of menu widget