Fix White text and missing buttons