Fixes layouting issues