Minor fixes with html ids changes, improved format helpers, renaming fixes