Add page fix
Minor fixes and work on regions/components