page ui tweek
merge code from jjq