Refactored UI entry classes.