Tweaking some layout