Clean up Run model
Add some shit to the navbar