moved some stuff around
Screen rework