Removed Menu class and added a close feature.