Refactored to model and css works better. Next step is to tackle maps