Fix modal z-index issue

Modal components did not have a high enough z-index. Moved z-index property to parent element and increased it to resolve issue