add action button, refactor layout