Add UI + Performance Tweaks