Clean up warnings
Add z-index buttons