Main and Total screens bug fix