Draw images better
Clean build
Fix route layer