changed UI, added directives