added modal and more layout