Refactor layout to make content use extra space from the shorter sidebar