Bug fixes layout adjustments and elementloading  for specific module