Most of the changes done. Need to implement tests for lots controller and helpers
refactored lots helper