fix BaseScreen comments and visibility