Update to latest pogo and tidy ui a little