Wrapped the inline conditional for correct evaluation.
Make layout more dynamic.