Fixes some layout problems