refact InnerActivity and fix issue#11