Further mobile refactoring
merged changes