More Actor refactor
Tied in some UI elements