Fix screen order issues in awesome