layout fix
handle galary intent
and more