Fix layout issues
Conflicts:
	src/main/webapp/WEB-INF/zul/query/index.zul