Added element/table switching
Fixed z-index issue