fixed skip button bug i hope
resolve conflict with new display stuff