Reworked UI for clarity and added Bok-Choy tests