Fixed merge conflicts in the status-buttons branch and renamed