Improve Display Structure
Merge branch 'ModalStyling' into develop