Changes in UI, added new functional with proxy
Merge remote-tracking branch 'origin/pele' into mazanuj