fix #7
fix option menu in detail view
fix conflict