UI cleanup phase 1