Added new 0.png, small tweaks
Cleaned up and refactored