UI Enhancments and efficiency upgrades