added demo
some layout adjustments