Improved this whole sidebar thing