add and fixed more screens...