Move custom sidebar support to separate file