Mixed up the status-line a bit