Better sidebar positioning - Part 1

To be continued ...