re-designed layout style v2