Cleaned up store loading and file upload view