Added tooltips
Added actions to Create layout modal
merge