updates to final screen formatting
trying updates again
merge stuff