Reorganise screen to make more informative