merge a bunch of changes from mainline pickie
add back landing page