Refactor

Refactor crufty code, face lift for ui, and update for 2.6 server logs