Merge "Refactor/clean up Overview Actions buttons" into main