Revert "Revert "Dyanic and UI changes.""

This reverts commit d7ae358433d239d828cb966f77bc3c051f08277f.