Fix tooltip and other layouting issues