Added action icons, removed 2 rows grid, code review