Revert "Revert "UI 2 v2""

This reverts commit 5eae49aace87bb89d9562a47d4149895be8fe976.
Revert "Revert "Derp""

This reverts commit d180c3a61cf0532b98e35ae0f6762bbe9dcbe242.