Fixed z-index issue and added automathic counters