Got rid of tables, changed overall design