Removed obsolete code, added assignment buttons, minor fixes.