Major reworking - removed old UI system