Maing Template - Still Buggy