fix overlap keyboard shortcuts, add some layout icons