Added more buttons, still trying get the locations down.