Fixed button labels
Fixed indentation