Pushing to Staging

Fixes for HOA button and more. See previous commit and PR messages.