Cleanup
Added display helpers
Fixed geo intent for first use