better buttons; changed OR logic