Update: Adding comments and home link