Cleaned sidebar.html merge