Some layout tweaks. Added debug apk