Add Test Button and minor improvements
Fix AlertDialog Background on Android 2.3