changed manue layout - now using templates