UI classes still in progress, builder refactored