added new template loading
added buttons to template