refactor and finish removing pads from sidebar