Added svg icons & form elements