Full screen fix & State manager added