continued work on encounter UI