fix: minor refactorings and fixes to render better on smaller devices

fix: minor refactorings and fixes to render better on smaller devices #1431