focus elements, bugfixes