More redesign
Bundle update
Fix stuff
Fix