Minor reorganization and add 'fixed' class.