updated with last page and major ui tweaks