Renamed the button ids and removed default text from all buttons