Main Screen Fix