Adjusting Controller and added archive/delete functions