Refactor UI even more.  It's clean now