Small fixes/design updates