fixes two layouting issues