Fixed a few import discrepancy

This is based on this task:
https://github.com/barriespotter/Web_App/issues/27