1026 modify

Mostly about UI