Interface Improvements

Still Work in progress