Added proxy btn handling