refactor + add button plus for demo activity