Fixing z-indices and other bullshit..