fixed opacity, added current layer