Added z-index manipulation
some other changes