Fixed all the Visibility Issues