updated look and feel and form functionality