Merge "adding action attributes sidebard"