Fixed the order on the main screen