Cleanup
Simplified UI for Barracuda and Octopus.