Fixes some layouting issues