More demo pages and improvements for the list and button