Core optimizations & tune UI