Fixes aside-home styling and cleans up html parkup for page-home and header
Fixes branch conflicts