Fixed Buttons that were still clickable after disappearing
Merged Conflict