changed base template and small fixes