Fix templates, main page and added modals