re organized the main screen