clean up the migrations and models, start to format views