Fixed templates so the work with new layout + bugfixes for odd things
translation update