Progressive loading of sidebar, + code clean-up