1. More improvements to ui