First change from Jacob- functionality with buttons and start of renaming screens