TIME TO HIT PANIC STATIONS
Refinements to last commit.
Added props to the prop screens.