Add Eclipse mode UI toggles and code cleanup