Switched to svg
Optimized layout