Removed templates (just doing static html for most part)