Major Update

1) Update display layouts
2) Add secure question to retrieve password
3) Bug fixing