Some template refactor and styles