Screen templates redisgned