- Added highlightedCellDirection in custom layout attributes
- Little refactoring