Feature/osu library new style

Merge branch osu-library-new-style into develop