selector rect added, improved layouting,...