Domain pointer
Minor changes for buttons and build