Improvement by Thina
sidebar cleanup