ACTECQ-22 - Changes done for mobile version  (cleanup is pending)