Fix alignments backport - #226
All checks were successful
continuous-integration/drone/pr Build is passing
UI/UX