Speed optimization, fix sidebar loading glitch