Adding "Status" controller + bug fixing