Refactor TextViews
Fix location formatting
Change where listeners are added/removed