UI improvements in Edit sidebar