Improve: add populate actions, and change a view