Revert bc8fb30..9bea183

This rolls back to commit bc8fb30c1dc695a3ca3f016393ca6259e5f3368c.
UI Changes