move UI actions to separate methods; change some names