Changed the setup.sql file to include names for testing. Also changed layout a bit