Update activities and few more HTML fixes