Put the Rental Addon as a model fragment instead of setting it directly
in application model. 
Remove also unused code and imports