BAP-7036: Review
	- fix forms bugs
	- fix entity bugs
	- fix code style
	- fix layout