add options button
Merge branch 'add_title_id' into my_stuff