Bug fixes, menu class gui wrapper