Z-Index and Perf improvements