Merge & correct the layout of the sidebar

[Ajotah98]

I changed the layout to correct the grid problem on the header.

Also, I wasn't aware that the sidebar view also had the same problem for long titles, so I added a display inline that makes a better UI (in my opinion)