Made everything one screen again (finally)