further changes, fixes UI