layout updates and adding async callback
resoving the merger