Cleaned up some html, added separate input-type templates