Fixed #97, Fixed minor issues on ZIndex