Added controls hiding and showing