Feature/cleanup file display