Rework datastore queries; several UI modifications. Message sending is functional