Updated design and bootstrap support