import functionality, cleanup on controllers
fix jump around bug