Fixed issue 31: z-index climbing too high