Change arrows
Restore padding
Merge branch 'feature/change_alias_and_name_61' into staging