removed sidebar from base, and made changes accordingly