Work in progress on AFDP-51

More refactoring of the Javascript and JSPs in preparation for implementing the remove fixture story.