fixed: multiple fixes to mobile layer