Fix imports and add conditional check for button interaction

Fix imports and add conditional check for button interaction #555