Fixes and clean ups + added svg's