Increased performance and tweaked UI