Restructure landing, add improvements.