Use embed for homepage
More cleanup of views