I arranged little bit of codes before adding password logic to spot.
I changed little bit of UI.
Merge branch 'rfrost'