Split out the TopControls into a separate class.
Switch to using the gradle wrapper.