refactoring and ui fixes for of twig namespace form