Up to date with Arkestra 587b5a62d0047b9d1dc8d38fcf72e8457b4ecb2b

Includes CSS improvements