Fixed order and display glitches & stuff