Updated screen, fixed a bug