improvements to shortcuts ui. incomplete