Nicer layout
Now storing password while activity is not stopped