Fix BUG for Home Page