Fixed up things...

Tidied up a lot
Use PreferenceActivity