Updated screen and index with password fields and directory