updated with connection and capture pages