Added assets, more styling
Merged
styling
Merge to end all merges