Code refactor & add edit activity

todo: pass data between activity...