Fixes + DefaultButton states parsing & init