Fixes minor layouting issues