Built apk from last changes - some tweaks