[WIP] Adapt layout and typography