cleaned up modal & buttons