Interface improvements

Bring Old functionality to new version. Working interface.