Fixed AddScreen

Added a number of fixes