Removed bug work, updated menu