Fixed migrations dependencies (partially), cleaned up views and urls