Attempt to clean up sequences and re-order buttons