Fixes to broken action button