Add the status button. Needs refactoring