Refactor live and workout interfaces