[PATCH] Captive-portal: Design changes