Added controllers, removed focus-attribute