[Layout]: Improvement usability