Fixed and closed #197
Fixes on the home page