Fix height/sidebar problems