some structuring and fixes for big screens;