Changed frontend theme layout mapper and appropriate logic