moved gui names and added button controls