Ui overhaul dynamic (33/34)

Ui overhaul dynamic