UI work on nav buttons for Handshake