Changed message Text
Added database for button state
Fixed service strings