Fixed visability issues