visibility changed && few simple fixes