Tweaked layouts and default files