Portfolio & merge with changes for Android