Revert "Revert "WIP UI Update 2""

This reverts commit dcf33d420ae1d5b8090433ca7d35dc29a9bb0f5b.