[Update] Formatting main screen