rework of main screen