Add view manager, change logic for show/hide actions