Restructured, handle single quotes, and add menu.