Fixed UI z-index issues