Fixed imports, began rewriting views as necessary