Janet ui

Merging in the UI fixes