fix order methods, add button, change header