included dataframes in page, move error handling and tweak