Yes. I also thought that while implementing. The reason not to merged them is not to change UI structure too much. I rethink about it.