fixed bugs with buttons and textview
merged conflicts, and added one more null check to locationhelper