some changes
final UI