Cleaned Up MainScreen UI