Improve Default Layout