added functionality for the more button and configurations for it.
merged the conflict.