Fix alignment of labels and placeholders

Fix issue #7166
Use controller instead of including the file

Fix issue #7166