LPS-35357 - setup wizard alignment is off

http://issues.liferay.com/browse/LPS-35357
http://issues.liferay.com/browse/LPS-35305

Also fixes:
http://issues.liferay.com/browse/LPS-35307