Drawing the screen correctely, also fixed intedent