ui improved a bit