UI improvements, bug fixes. Fix interaction with server