Minor changes to data and base files
Cleaned up get next item loading process
Preparing for new prompt layout