Improved performance, updated ui