Started on proxy support
Added UI for proxy