More refactoring, adding acquire button