sidebar & other fixes