added in a table and switched structure to use angular modules