fixed display logic and made everything use it except modules still to come