Update toolbar aka downgrade to static
Refactor the theme layout and modernize