Remove battery elements

This is no longer happening.
Fix page outlet order
Update TODO