fixed templates
fixed sidebar and edited db