improved performance and ui