Clean up controllers, helpers. Add tracking-image