Simplified widget name
Renamed widget ids and button values