Revert "Revert "version 2""

This reverts commit bbbf864d125f4b3ff9ee8566883bacc318c9b665.
fixed a couple more ui items