Consolidated multiple functions, will improve flow of program and remove several buttons