Consider popup menu when expanding. Close #154.