Some more work on getting the Equipment screen together.