Re-organize assets, style tweaks