Changed images to buttons so they are clickable.

Changed some variable names too.

Change-Id: I166d996389c84d00782cba42169c991f8f0f923e