Bug fixes and table definition (faculty portal)