Layout/HTML clean up

More cleanup of the default layout