Fixed index layout
Added pw and authentication of pw