Renaming some of the buttons (set and lock)
Removed public data member that shouldn't have been in HomeActivity