Ui overhaul dynamic (24/34)

Ui overhaul dynamic