Fix pause buttons
Consistent naming
Fix close behavior
Remove unused code
More cleanup