implemented better buttons