Started to implement more screens