Cleaned up Fuel Handlers

Closes #290
Fixed Pane rendering