Fix issues with header bar and sidebar width