Action plan dropdown + things to do fix
Merge origin/master