Unnecessary buttons at the popup removed. closed #13