Fix weird issue w/ action button
More distraction blocking
Fix bug