Mladen fixes for the website