BAP-7036: Review
	- fix layout
	- fix translation
	- fix entity constrain