Cleaned up data and home screen for demo