refactor main view + lot