Clean up + fix view